Combine two columns in pandas dataframe but in specific order